Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Thu, 11 Feb 2016 23:18:15 +0000 (18:18 -0500)
committerTom Rini <[email protected]>
Thu, 11 Feb 2016 23:18:15 +0000 (18:18 -0500)

Trivial merge